From: bors <bors@rust-lang.org>
Date: Tue, 5 Sep 2017 16:04:29 +0000 (+0000)
Subject: Auto merge of #4467 - RalfJung:locked, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~6^2~66
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=f8dc1e9e3b5f3a48884c432a9ec4b1ac730b7172;p=cargo.git

Auto merge of #4467 - RalfJung:locked, r=alexcrichton

fix error message when --locked is passed but lockfile is outdated

The logic is currently the wrong way around, saying I passed `--frozen` when I really passed `--locked`.

I had no idea where to put the test...
---

f8dc1e9e3b5f3a48884c432a9ec4b1ac730b7172